Revert "change var naming to kernel standard way"

This reverts commit 729316019eeba08af143ee06f04d5f7d8a3b0ee5.