Rename to fit convention