Fix naming mess
Fix duplicate includes