Consitency

Updated to conform to naming conventions