Changed model names from lower case to upper case