Changes to naming, reorganized