Fix #20: Naming issues