Refactored naming, preparing API for bug 916217