General renaming...
minor cleanup
minor cleanup
cosmetic changes