LPS-42184 Rename the methods to make more obvious that we are getting a map