More renames and modifications, upgrades