VOLDEV-10: Replace all occurrences