Fix dumb asset names and duplication