Update and rename sources to remarks