Small modifications to names and docs