Fixing names for distribution