Renamed collections and models to be uppercase. Keeping with convention