Renaming and small changes to the new pass-sceletons