Fixed linking errors due to rename