some name changes and other clarifications