some renames - naming cleanups