Adjust naming to convention