REVIEW: compile naming fixes