Fixed unused usings and filename inconsistencies