Better name spacing

Should help alleviate any overlapping CSS declarations.