renames derived from ceylon/ceylon.language#241

and remove some rogue whitespaces while we're at it...