Adjust naming