Bug in PhoneSelector/Calculator

Fixed bug, so that CrespoConstants are actually used everywhere.