Fix for naming issues