Simplify naming.