framework: refactor, naming