Add switch and standardize names