EVE URL changes

Same as #602 but for 0.3.x