minor namechanges

Signed-off-by: Marfyy <martinsafsten@gmail.com>