Simplify naming scheme