bunch of updates to help with prefix change