Shorten several names. Close #216.
Fixed #217.