toward meta 2.0 renames and cleanups

parent cc3424a5