Changed names to fit convention

Signed-off-by: Arthur R. Wuterich <arthurwut@gmail.com>