Fix Change to Rbs namespace refactoring