BUG-204 : Cleanup models to follow convention