Changed some common button names to the names that they will have when promoted to common code, see #94.