Some renaming, preparing to do some work on layerwise training