FIX: Naming issues and changelog