Refactor clases names