changed naming to be consistent