Use Self keyword instead of concrete type name

Use Self keyword instead of concrete type name #821