Renaming and fixing up passenger module.