naming and version cleanup