Fixing the names to accurately reflect the contents