fix name toggle mechanism