clean up comments for extended naming scheme