Further renames and organization fixes