Revert "Refractor to new name"

This reverts commit a5a8291f27ebb12d605e1ae34d14179ae129317c.