Inline
Name refactoring
Assert
Typedef changes