Revert "Change Ubuntu symlinks and renames"

This reverts commit 38b73d7940a9d3bcfe36960fe6bfb1aa58402d20.