Port to malus version 0.3 and adjust symbol names accordingly