name changes and other improvements for consistency