Fixes naming issues