Fixing small bug in naming issues