Maybe it's better to keep names consistent?