Everything has been renamed for clarity (hopefully). See Trello for list of things that still need to be done.