Refactor extensions class names
17 files changed