Renames

here is a couple of more subtle name-fixes, renames, tag-additions + updated girlpowers