Change base grammar
Fix changelog versioning