Class name refactor+aspect test fix