[TASK] fit to namingscheme
[TASK] Several