Fixed .name issue and removed underscore dependancy

Signed-off-by: Ben Evans <ben@bensbit.co.uk>