Updating to more generic paths on public branch