Rename components & cleanup