renamed some things to be more conventional