Changes "at" marker to avoid clashing with names