RavenDB-1652 fix
(note - controller rename to prevent possible conflicts)