fixed spaces and naming