Rename of most items and blocks to fix capitlization and to give proper prefix