Change all references to 8080