Rename file; fix --port option