Startardise Model names and Unit Test names