more re-naming and cleanup