Fixed all linking issues related to name changes