Make names unexported