Change the names of various things in support of ceylon/ceylon-compiler#1360