fixing rpc stuff and file names