Some name changes for clarity