Removed old key naming classes.