Made everything follow naming conventions