Staging: samsung-laptop: fix up some variable nameing