Final fix for naming issues