Moved all references of socket and interface to the core