Fixed CORE-2161 for wrong naming convention