Updated some of the naming coventions