Python cleanup

Small renames in Python tree remaining from the large debian reorganisation.