Fix version compatibility and follow naming convention