rename stuff, remove singleton interface