Use app-independent terminology (for later centralization); reference fixes