Fix naming and spaces.