Name changes to solve compilation problems.