change some symbol names for consistency