Renamed some things to have a little better naming convention