Refactor names of classes & resources