Updating Expression interface name to PSR