Updated to follow naming convention