Fixed .name issue and removed underscore dependancy