changed naming and simplified prefixing