Naming and versioning improvements