Cleaning up and being a bit more consistent about naming