Fixes for linking errors which arose in renaming