updated naming to be consistent