Renamed variables according to naming convention