Fixing spaces and naming.