Small changes; renaming