Simplify naming scheme.