Removed unused requires. Fixed naming