* Reorganize and clean up card defines * Fix define spaces * Unify card naming * No (real) functional change