Rename some module terms for clarity