Rename to keep names consistent throughout code