Renaming for consistency; fixes #83.