renamed some stuff for future coding purposes