Fixed wrong method call and include names