Some namge changes and cleanup