Fixed naming conflict and versioning scheme