More commits. Renaming. tiny fixes