More pull requests merged in. File rename too.