Rename to the more suitable name