Fixed inconsistencies with conventions