adding some map pointer name cleanup for testing