rename these to be more in line with naming conventions