Refactored naming conventions

Signed-off-by: Simon Bailey <simon@newtriks.com>