name changes for consistency, framework part 3