Following the proper naming convention