Here and there renaming, adjustements.