changing names to arcadia
Merge branch 'develop' into hydrate