Shortened names even further, and updated tests.