'interfaces' role is renamed, and some code is cleaned up