rename class and some work on default priority (non-functional)