Fix package declarations in accordance with previous commit