change|contract: some more naming convention