Refactoring to fit namingconvention and OXID version 4.7+
Refactoring to fit namingconvention and OXID version 4.7+