simplify naming

Signed-off-by: Dylan Borg <borgdylan@hotmail.com>