replaces dodgy names

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>