Updated to naming convention specified by the prof