Update preamble to more intelligent naming, add General description