Issue11 tidying

Include @PixHive changes, but correct file cases & use of underscores.