Simplify naming